Merge from trunk.
authorDavid Engster <dengste@eml.cc>
Sat, 1 Jun 2013 09:40:00 +0000 (11:40 +0200)
committerDavid Engster <dengste@eml.cc>
Sat, 1 Jun 2013 09:40:00 +0000 (11:40 +0200)

Trivial merge